From 46fbefe79504f288d89d376940e3ae514b233951 Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Thu, 31 Oct 2013 15:54:28 -0500 Subject: [PATCH] Win32: Honor the geometry when GDK_HINT_MAX_SIZE is set. The MINMAXINFO struct was being populated based upon geometry hints when GDK_HINT_MAX_SIZE flag was enabled, then promptly having its values blown away with default values. https://bugzilla.gnome.org/show_bug.cgi?id=711110 --- gdk/win32/gdkevents-win32.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c index 31eb5120ad..e7524d0bc8 100644 --- a/gdk/win32/gdkevents-win32.c +++ b/gdk/win32/gdkevents-win32.c @@ -3074,6 +3074,11 @@ gdk_event_translate (MSG *msg, mmi->ptMaxTrackSize.x = maxw > 0 && maxw < G_MAXSHORT ? maxw : G_MAXSHORT; mmi->ptMaxTrackSize.y = maxh > 0 && maxh < G_MAXSHORT ? maxh : G_MAXSHORT; } + else + { + mmi->ptMaxTrackSize.x = 30000; + mmi->ptMaxTrackSize.y = 30000; + } if (impl->hint_flags & (GDK_HINT_MIN_SIZE | GDK_HINT_MAX_SIZE)) { @@ -3086,8 +3091,7 @@ gdk_event_translate (MSG *msg, mmi->ptMaxSize.x, mmi->ptMaxSize.y)); return_val = TRUE; } - mmi->ptMaxTrackSize.x = 30000; - mmi->ptMaxTrackSize.y = 30000; + return_val = TRUE; break; -- 2.30.2